From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 6 Mar 2014 11:23:25 +0000 (+0100)
Subject: tmem: drop a gross goto usage
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5512
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=3f5c613287e79b44d4e4b10e0193581b7442249a;p=xen.git

tmem: drop a gross goto usage

No need to do it that way.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index d9e912ba06..02e7e2eaff 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -2614,17 +2614,15 @@ long do_tmem_op(tmem_cli_op_t uops)
 
     if ( client != NULL && client->domain->is_dying )
     {
-        rc = -ENODEV;
- simple_error:
         errored_tmem_ops++;
-        return rc;
+        return -ENODEV;
     }
 
     if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) )
     {
         tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str);
-        rc = -EFAULT;
-        goto simple_error;
+        errored_tmem_ops++;
+        return -EFAULT;
     }
 
     if ( op.cmd == TMEM_CONTROL )